Support modularity (with separate states)