Added base user bundle with group support