Improve ResourcesManager a bit