Fix IPCR issue

Fixed schema and handlers.