Added search method
Refactoring of login classes
Refactor in api wrapper