Added some new features.