MAJOR LANGUAGE CHANGE: merged attribute and agent declarations