Change API based on Steffan's feedback.