Restructured to handle User & Org differently