Added some new Features