Fixed animation bug.
Added support for MapType setting.