Added a some new features.