Updated Configuration Class :: Now has all features