Added checks for bindable types