Switch from instanceof to includeMap lookup