Add support for transition