Updated ResourceManager with new API