357 project system relation refactor