Add in Types and Statuses