ENH: Better write support