Columns converted to attributes, and refactored