added Group and User (copy from web-project)