add RFI model and join table, fix config