Added mehtods to the classes