Added more flexible wildcard support to BaseBlock in a different way.