Reduce coupling between Dsl and Definition