Darin Morrison Add missing cases for atom