Make it better to support other platforms