Took out delegate and mapped like other collection