Added support for stored values.