Added SearchKey for easier caching and SearchType for easier query contruction