Migrating to a entity system model