Add generic arguments to Answer