Changed yaml format