Updated default options handling.