Allow more wide uses of options, and allow relations to have sql options