Changes for Cross platform ness