Changes for code review of Description editor