Changes needed for cleaned-up 2.0 API