Added non-literal values option