Updated "common" and adjusted usage of StructType correspondingly