Adjust index variable names.
Use arrays for list of attributes.