Updates to YAML config hookup