simplified RegEx, added support for plugin syntax