Changing to match new yaml format