Extendability improvements