Preliminary work on putting EMv2 annotations in model.