Refactored StepAnnotationFinder