Adding more columns; changing types to ENUM.