Some other changes (inbox, framework and inbox_class)