Fixed initial data load/enhance to use datapump

Restores first basic demo functionality