Use scope blocks in relation definitions
Remove duplicate order specification