Continuing on preparing structure for CRM plugin