Additional commits for AssetsManager