Added first class bind
Removed commented out type check skips