Externalize more resources