Added a few more features