Updated id from type long to type int