Add a few more features