Improve cross platform