[master] Data Layer setup
[master] Change in model to load our file