Static resource management improvements