#29  Atomic support for pipeline and fix several errors