Updated common to include struct types