Start adding handling for generic relations.