Several changes on configuration classes