Map width and height moved to defines