@fgrehm You're right. I totally forgot about the monkey patches. Should we move it or wait until until #23 is complete?