e969970 user DSL bug fixing and refactoring