Restructure for authorative models