Modified to use new CommonResources