Updated according to new names of configuration properties