improved ids generation
3 files changed