Authorization adds and model method efficiency tweaks