Added life-cycle state synchronisation