Added handling for default options