Features/LegacyInterfacesRemoval