Replace Class<?> with EntityIdentifier