More flexible configurations as well as better CentOS support