Added some fixes
Added support for Tiles