Change API to be more intuitive