Coexistence of thread-safe and non-thread-safe commands