Implemented more features.