Most Jorum changes moved to addtions module