separating retrieve: #MSG-238 In Progress