Improved security and compatibility