BeansBinding refactoring

Change-Id: I24bbee57c046ef1cca795452f50854fe3f4664a2