Update some Regex Logic

Added more support to expressions