Adding support for all of the types as well as the complete file