Peter added several more interfaces