Adding support for User and Organization custom fields

Added to v2