Messaging data model changes and bug fixes.

Messaging data model changes and bug fixes (controllers).

Refactoring and fixes.

Refactoring of S3ChannelModel - enable/disable/schedule controllers. Bug-fixing.