Refactored method to reflect interface change
Added auto stage match counter
Refactored method to reflect change in the interface