added count/generic to extra, count/step to definitions