Adding support for animations