Updating references to the interfaces