Added features to parallel code