refactored to use new mapping for platform and marker type