Improve yaml file