Updated packages and changed the way the API works
WIP