Add missing cases for signatures