Improve attribute types