Made modifications so that all of the elements get imported as
datatypes.  I am not 100% sure that I did this correctly however.