type factories added & file types modified