Add extendability