Fix/id import

ready to merge