Improved datetime expression. Refactoring needed.