Added configuration manager to manage config better