Implemented more features