Fix incorrect use of immutable list and add joda LocalDate as primitive