Made forms compatible with groups