Adjusting API to match design intent