Adding support for multiple platforms