Add multiple column support