#1: Code refactoring, editor updated, entity categories added, new
entities added.