Issue: Added #platform and #platform_type