Add generic interfaces