migrated structure from utility into Model class