Lib changes for BATS