Fixed Metrics Setup
Added Message.class