Add transition support