Added attributes instead of individual tags