Changed implementation of wildcard mapping