Cater for empty items collections
Update default return path
Merge and resolved conflicts