Added Editor class