Refactoring: Atom -> Relation