Add e-number support #7