refactoring client options
refactoring of library links