Adding ContainerSynchronizer and removing container sync-related code
duplication