Added more fields to generated yaml