Inbox update

Added some additional implementation of Inbox