Moved account attributes into address