Implemented final tweaks to make it work with progress_crm