TileMap improvements