support for Time property, refactoring, updated_at fix