Add expr mapping. Ref #74