Additional BS3 updates

Additional BS3 updates