Implemented missing features.