added custom fields association to person and organization