Updates create_organization utility function

Still requires updates for handling old style arguments to maintain
backwards compatibility if feasible.