Add Refactored code for IBinderRepository and BinderRepository