Added classes for libavg