Performance enhancement

