Improved extension mechanism.