Make API more sensible