Added extra attribute handling