Added the missing features.