Refactored libraries