Added platform images and support for more platforms