Improved multi socket support