Added some new feature