diff --git a/src/main/scala/db/PostgresService.scala b/src/main/scala/db/PostgresService.scala
index b8c53c7..7224165 100644
--- a/src/main/scala/db/PostgresService.scala
+++ b/src/main/scala/db/PostgresService.scala
@@ -15,6 +15,7 @@ import parse.Aggregate.{AggregateKey, AggregateValue, DoubleValue, TimeDoubleLis
 import parse.{Parser, WeatherStationData}
 
 import java.time.temporal.ChronoUnit
+import scala.util.matching.Regex
 
 object PostgresService {
   def of(transactor: Transactor[IO]): IO[PostgresService] = {
@@ -24,13 +25,25 @@ object PostgresService {
 
 class PostgresService(transactor: Transactor[IO], log: Logger[IO]) {
   def save(fileName: String, content: String): IO[String] = {
-    val strLines = content.split(System.lineSeparator()).toList
-    val weatherStationData = strLines.flatMap(Parser.parseLine)
-    insertInWeatherTable(weatherStationData)
-      .attempt
-      .flatMap {
-        case Left(error) => log.error(s"Write db '$fileName' failed with error: ${error.getMessage}") *> IO.raiseError(error)
-        case Right(rowCount) => log.info(s"write rows: $rowCount file: $fileName").as(fileName)
+    val YearPattern: Regex = """(\d{4})\d{4}_\d{4}\.csv""".r
+
+    def extractYear(filename: String): Option[String] = {
+      YearPattern.findFirstMatchIn(filename).map(_.group(1))
+    }
+
+    extractYear(fileName) match {
+      case Some(year) =>
+        val strLines = content.split(System.lineSeparator()).toList
+        val weatherStationData = strLines.flatMap(line => Parser.parseLine(line, year))
+        insertInWeatherTable(weatherStationData)
+          .attempt
+          .flatMap {
+            case Left(error) => log.error(s"Write db '$fileName' failed with error: ${error.getMessage}") *> IO.raiseError(error)
+            case Right(rowCount) => log.info(s"write rows: $rowCount file: $fileName in year: $year").as(fileName)
+          }
+
+      case None =>
+        IO.raiseError(new RuntimeException(s"Could not extract year from file name: $fileName"))
     }
   }
 
diff --git a/src/main/scala/parse/Parser.scala b/src/main/scala/parse/Parser.scala
index e733dab..d0e259f 100644
--- a/src/main/scala/parse/Parser.scala
+++ b/src/main/scala/parse/Parser.scala
@@ -1,20 +1,16 @@
 package parse
 
-import parse.Aggregate.{AggregateValue, UserQuery, aggregateDoubleValues, aggregatePhenomenaValues, aggregateByField}
-
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
-import java.time.temporal.ChronoUnit
 import scala.util.Try
 
 object Parser {
-  def parseLine(line: String): Option[WeatherStationData] = {
+  def parseLine(line: String, year: String): Option[WeatherStationData] = {
     val paramCount = WeatherData.getDoubleParamCount
 
     def parseTimestamp(timestampStr: String): Option[LocalDateTime] = {
       val formatter = DateTimeFormatter.ofPattern("yyyydd.MM HH:mm")
-      // TODO figure out what to do with hardcoded year. Proly fetched data should be also modified to include year
-      Try(LocalDateTime.parse(s"2023${timestampStr.trim}", formatter)).toEither match {
+      Try(LocalDateTime.parse(s"$year${timestampStr.trim}", formatter)).toEither match {
         case Right(timestamp) => Some(timestamp)
         case Left(_) => None
       }
@@ -35,25 +31,4 @@ object Parser {
       weatherData <- WeatherData.fromDoubles(strList.map(_.toDoubleOption), phenomena)
     } yield WeatherStationData(city, timestamp, weatherData)
   }
-
-  def queryData(userQuery: UserQuery, lines: List[String]): Map[String, Option[AggregateValue]] = {
-    val weatherByCity = lines
-      .flatMap(parseLine)
-      .filter(line => userQuery.cities.toList.contains(line.city))
-      .groupBy(_.city)
-
-    weatherByCity.map { case (city, weatherStationData) =>
-      userQuery.field match {
-        case "phenomena" => {
-          val phenomenaList = weatherStationData.map(_.weather.phenomena)
-          (city -> aggregatePhenomenaValues(userQuery.key, phenomenaList))
-        }
-        case field => {
-          val doubleList = aggregateByField(field, userQuery.granularity, weatherStationData)
-          (city -> aggregateDoubleValues(userQuery.key, doubleList))
-
-        }
-      }
-    }
-  }
 }
\ No newline at end of file