Added transition support to load and save