Added transition animation support