Changes for behind EBS, no more datastore needed