Improved platform support