Added more support for OpenMP parallelization