Added more Entities, also hash and equals.