Updated to support generic data types and fixed GRC XML file