Make EntityEncoders vals where possible