Updated Cast regexp