Extension & demo updates