Changed ID's from int to Long