Added some new feature functions