New id generation strategy, refactoring