Better support for tiles