updated entity classes to take LongKey params instead of Longs