Change API a bit