Prepare for the new way Unexpected handles types