Improve lib calls