Added support for animation and includes metadata