Added onCloseModal and onFinishModal options