uncomment type definitions until code gen is run