Updated some packages and added a few classes with a little implementation