Added support for speedometer-0.0.4