Update remaining workflow module.

still need to improve..