Change the retrival class method