Updating Dsl for all types