Added extended Binder support