minor refactoring issue
Annotation for the destination as property
lazy instantiation
refactoring for the current step annotation