Add ResultWrapper, update edmx, service