Remove dependency on Atomic