Authoring tool refactored