improved InquiryTypes