Added heavy generic part
Improved editor interface