DefaultResources implementation improvements