Closes #24: Track ordering after import