Some more work on expression graph