Minor design change to API