Adding the @NaturalKey to the MVAS model
more model changes