Added platform independent support