Implemented more functions