Added support for parallel groups + Cosmetics