Added more features to editor