Data Layer improvements. Faster model load.