Changed id types from int to long (just to be safe)