Added back missing features from PR.