Updated for new org/user custom fields