I am having trouble trying to find a calculator that allows for two kinds of employer contribution.

At my job now, we get a 50% match up to 6%. In addition, this year we are getting 2% of our salary deposited to the 401k, broken up over the 26 payperiods. Next year, this number rises to 4% for a total match of 7% on 6%. All the calculators I have found assume only the first part exists. I can't find any that will calculate for additional contributions or maybe I am just looking in the wrong places?