Move add handler functions into TileStorage