AssetFolder/AssetManager changes