Moved more attributes into attribute traits