Add new ECElementTypes
Cleaned generics in ECC