Add change-bucket-owner and refactor