Refactor relatable and finished primary relation