Hi sds-, were you still planning to (or did you already!) make a pull request for these changes? They look very cool!