Add WITH support to Ronja [DON'T MERGE]