Updated until OpenEPC