Added Configuration class