Remove coupling between configuration and client