Made some improvements and added some methods the the classes