changes to allow more wildcard operations