Fixed bucket suffix placeholder
Fixed initial version