Added support for wait animation