Fixed bug: Missing custom values property for organization