Adding support for wildcard characters, added timing