Restore relations support as an option