Updated yml mapping