Various extension to private libraries