Improve yaml