Made entity key optional