Initial submission of BNI-specific changes.

Initial submission of BNI-specific changes.