Added a little bit of classes