Add support for custom transitions