Moved towards Di for the DSL