Add dictization for orgs