Added insertion of initial zero bucket
Script execution moved from DataSource to Storage