Adding handling for disjoint cases for function declaration