Changed library to return objects instead of maps.
Library is now a static class.