Add in array types, and binary