Add organizations and better mappings