Changes for inclusion of tiles