Follow the 1.5.1 interface change