Updated to use new Java8 date libraries.