Added platform selection