Changes made to support new version of cah gem with better interface.