Fixing commit functionality for (at the moment) only support 2 key pivots