Added AMD-compatibility for some Echo Classes