Changed triggering annotation back to @GenClassname