Added support for multiple key columns