Adding Group Based Policy features.