Added some features.