Refactored yaml to fix hash format