#47 refactoring Client: finish import list