Add propagation control and sync with adpater