Added attributes
Added template