added default attributes

Merging in changes from feature/attributes