Adding some new features