Improved grunt build. Does not traverse all datatypes.