refac + made extraInterfaces more robust