Added some new functionality