Added preliminary feature to embed returned values in attributes