Additional logic for Org add/update