some refactoring from samba to users
added temporary expect depend