Don't store key in entity but in Store