Code update

Add configuration manager