Added support for e2 service generation.