Modify retrieve functions