Add expression version info
Updated components