Multiple column support added