Updated to new user security model