Now using extend for default options