Updated options to use defaults and not extend