Support for longer animations
Added multiple map layers