Added event capture for FIB