Descriptor editor classes consised and simplyfied