Updated domain classes: replaced 'int' ID by Integer --> helps
identifying new entities