Add support for subscript elements in EP
