Same comment here about type in the object vs. bucket_type. Since this is client code, I would urge you to do the change here before merging. Internal code can be cleaned up, refactored easier later, but here it could be a sore point later.