Added support for e and pi