update retrieve handler