MOBSDK-683: Change the way the repository handles the mandatory aspect part of the model