Added asterisk support and separate path definition