Added support for eps of complex types