Changed to have an Entity Management System