Update to make the sql script a little nicer
Update the sql script with appropriate group names