Merging changes to pjdump importer to be derived. Some fixes done.