Added user and group models