Updated attributes parsing