ENH: Better interface