- Some clean up in the transition factories
- Adding XML attributes (Fixes #15)