Adding some new features.