Simplified attribute list handling; Test on-going