Updated Animation class