Added configurable on finish callback