Refactored AssetsManager