Improve attribute handling.