ENH: Much better support