Tested includable DSL. Review to follow - docs need to be updated too