Add to methods in individual
Refactor EntitySearch methods