Added base support of Groups system