Changes to add new features for comments and transitions