Added default attributes
fixed default attributes