Add FBA functionality