Updates with template separation and sync