Refactor: Relations improvement