Moved datetime to use timezone instead