Adding some more features