Started working on new configuration handler