MOB-1177

**DO NOT MERGE YET**
Why not do this in `getDefaultData` ?