Changed implementation to remove all types and instead use SearchTypes