Improved extension support