updated generic to the latest relationship types