added editors, refactored data import