Updating User and Group inheritance so they no longer extend deprecated entities