GH-8 Update old code to work with blob, renaming etc.