Improvements and added more features