Added onFinish callback as property