Feature/user bundle