Changes for group model functions