Tilemap: Update and improvement