Updated a lot of models and api as well as js