Made generated types work