DateTime external class issues removed