AVI support added