Implemented handling of default values from options