No need to extract expression anymore