Added delegate to map