Preemptive change of id to type long