Add gard statement for User and Group