Update Retriever and Handler classes