More changes to Options delegate