CR changes: used retrunValueMap() instead onConsecutiveCalls()