Add part of animation support