Adds measures support