Changed from static to yaml data