Change API based on @arrbee's feedback