Id and hashcode/equals additions