Code update for functionality before data model change