Implemented some more methods