AbstractWorld and Map class updates