Fix overlooked commands.xml ref to support yaml too