Small changes regarding ResourceManager