Added Metrics + improved the command Handler + Formatting.