Modifed all java classes due to search functionality