Added getting/setting entity key values