Mrafsan/chore/refactor bind