Made faust wrapper a bit more generic