Optimize so that we not touch the 3rd party lib at all