Refactored to have libraries be more consistent