Improve support for 3-rd party platforms