WIP ENH: Better support