Need a way to find how to support wildcard mapping, so for now add a hack