Models refactoring and synchronization

Make sure the models from common-model match the models in this project.