Add in configuration handler with testing