Change some things in the server
Change API