Added EntitySpawner, slightly changed map format