Added select and collect to the zap resource

Change-Id: I689e842168656ffdde034bfa849f47f33ee13b55