add generic relations and co