Added attributes support