Change data structures to GSList

Change-Id: I4ae865c15614a3b6a93a71e61264da1ba244d791