Adding special case handling