Improved resource manager