Make a more consistent API