Improve resource management for RPs