Updates to the Options framework