Use correct type from data layer
Move update time to the top level
Move update time to the top level