Updated to use Wildcard Events