Re-added custom datetime handler