Started adding platform support