Removed Pattern highlighter and made everything working by pure resolving of references