Added support for parallel parameters + Cosmetics