Updated id's to longs and updated label sync