Fixed entity so it can be used on client-side as well as server-side (can't use Key type on client)