Added Type enum; house keeping.