Better attribute handling