Resource management improvements