Added Search and others