Refactoring of Relation concept NOT FINISHED