Refactoring around IdGenerator