Add findAll plus request-type-specific extracts