Better attribute handling, updating, etc