edit refactoring for bind support