Added picking to generic primitive