Addition of some more features