Changes in ITileSourceProvider + small optimization