Changed all ID's to Long datatype