Add multipart case for upper case boundaries