Refactor "Id" to be a Long type instead of Integer. Issue #17