Make API more consistent