Added multi param support