Adding custom animation support