Add processing of default options