added Group/User account entities