Improve AssetsManager logic