Added cross-platform automatic support