CRM-12762 handled for the remaining custom data & did some improvements