Added attributes parsing