Moved to generic package + Added support for textures