Improved deployment compatibility