FEATURE - Add more fields to organization