refactor(all) changed dsl for proxy