Switched to Java Long based id notation (instead of Integer).