Adding a few more features