Added animation support