Add support for asterisk