Adding key support on entities