Allow completion routine to return hash (in addition to array)