Moved expressions to the plugins