Convert to native inheritance (remove dejavu dependecy). Fix Some bugs.