BDD: Update structure for the inheritance fix