Add with_attributes to override both transaction and organization ids