More consistency in API