Move the constructor addition for yaml