Added support for default attributes