Improve SingularityClient Guice module and API