Added non-deprecated code.