Change Time to DateTime to avoid time zone issues