[task] added and refactored Builder header to User and Group