Added search methods and refactored data