Feature/add more users