Adaptor interface with (optional) credentials parameter, Credentials
interface, impl package refactoring, warnings eliminated