Made attributes make more sense