Added User and Group scaffolds