Refactored library to test for public clients