Updated spec/classes