Add epair management code