Update to make project cross platform