BIP-135 pod refactor changes