Added code for initial data load