Refactoring + Entity introduced
Map rendering changed