Creating generic data by default
Merge branch 'dev' into feature/api