Added some missing features.