Updated & added some classes