Refactor last_updated_at