Issue #183 - Add expiration group option