Enhance healthcare DSL