ENH: Better API