Add support for more platforms