Implemented more methods