DatabaseColumn refactor