Added binder and types support