Added missing cases