Add some useful classed and some changes