Improve Map to use TileSets