Rethinking Entry-Exit: Two new tariff models to foster competition and security of supply in the EU gas market