#40 Template sync - adapted messages for events