Model, Api and authorization updated