Improving editor and added few more classes