Added nested attributes for values/actions