This can go to DefaultOptions, no?