Adding better parallel API and some renaming