Move bucket creation from sync into separate method.