Refactored into sepearte libraries