Make options available on the spec objects
Hide the options data structure better