Keep date formatter static and improve error handling
Add dateStart/dateEnd fields