Added default values and small fix