Add wildcard bind support