Added id field into emoticon
Change the type of the id from int to long
Reverted back from long to int with wrapper class