added more entities, map and map reader