Modified interfaces to remove dependencies to concrete instances.