Added delegate and protocol to map(s)