Improve idSequence usage
Organize imports