updated token sub to handle fab config