Added new Message field & updated class name convention

Signed-off-by: Elliot Condon <e@elliotcondon.com>