Need to pass the bucket type to the FSMs too.