Added more interfaces