Add support for non-typed as well as array value elements