Major Commit - Add support for multiple columns, minor fixes