Follow sklearn API changes