Added currentStep callback and method