I'd like to avoid that now. I understand your readability point. On the other hand we currently have two reference types (one of them is temporary). I'd postpone this action until we can unify them. It will also mean to redefine the DSL in foreman plugin (the references are foreman specific).