Made Tiles structure a bit more robust