Replaced Joda-Time with JDK 8 java.time