Added a few obsoletes