Code refactoring
First realization of the object searching