adds support for custom user and organization fields api