Added the Message storage classes