Added Regex Support and Menu