More updates in ongoing attempt to add datetime support