Adding animation support