Adding multiple column support