Added Configuration class and some changes