added check for id on import