* Changed list from array to object