Added Animation support