Redesign some synchronization features

refs #26