added class search for database storage