Basic Changes for Inbox implementation

Implemented the basic infrastructure for inbox implementation