Resource manager improvements