Bunch of refactor to tileData storage