Add generic structures