Improved group compatibility