Performance improvement <Karthik/Kotti>