BAI: Disambiguation refactor

Signed-off-by: Mateusz Susik <mateusz.susik@cern.ch>