added multi-platform capabilities to all measures