Performance improvement on fetch