Removing hardcoding of concurrency