Migrated entities to improved module format