adding attribute handling