Component-Based Development (CBD) reduces development time and effort by allowing systems to be built from pre-developed reusable components. Partitioning the behavior into a set of major operational modes is a classical approach to reduce complexity of embedded systems design and execution. In supporting system modes in CBD, a key issue is seamless composition of pre-developed multi-mode components into systems.We have previously developed a Mode Switch Logic (MSL) for component-based multi-mode systems implementing such seamless composition. In this paper we extend our MSL to cope with atomic transactions, i.e., to handle sets of components that must not be aborted in the middle of the processing of data. This is in contrast with our original MSL, in which components are immediately aborted to perform a mode switch. Based on our extended MSL, we provide analysis of the mode switch timing.