Be a bit more consistent with API