Worked on multi-platform support