Refactor models (Entry/Section)