Change API a bit.