Change id type from Integer to Long

JIRA:
CG-78