Add special case handler