Added support for AVI