Enhancement partial to support expression