Added yaml_db from fork