Added search(), expanded with() and refactored response handling