BrAPI 2.0 support

BrAPI 2.0 support