some changes to EBI architecture