Adding additional modifications needed for BSDP functionality.