Thanks to @josevalim this is a lot simpler now.