WIP: Intermediate
ENH: Better support