Updated Editor class