@aiten Changed DSL to be more readable