changed id type from Integer to Long