Improve libraries