Adding in Type enum