Converted resources to use new client